lib/sign: make dummy engine non-public

Remove unneeded public declaration for dummy signing engine.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

diff --git a/apidoc/ostree-sections.txt b/apidoc/ostree-sections.txt
index a5a632a5f091635049ab85a9d545f05ed880201e..e61b46c3b36523819d6141b100d47e078773e6e2 100644 (file)
--- a/apidoc/ostree-sections.txt
+++ b/apidoc/ostree-sections.txt
@@ -709,7 +709,6 @@ ostree_kernel_args_to_string
 <SECTION>
 <FILE>ostree-sign</FILE>
 OstreeSign
-OstreeSignDummy
 OstreeSignEd25519
 ostree_sign_list_names
 ostree_sign_commit
@@ -726,6 +725,5 @@ ostree_sign_set_sk
 ostree_sign_summary
 <SUBSECTION Standard>
 ostree_sign_get_type
-ostree_sign_dummy_get_type
 ostree_sign_ed25519_get_type
 </SECTION>

diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym
index 29221f5d41c0529e733644aca06189cecce509a0..730eac3e9b5e67cf17955574fb2c68e3c025af88 100644 (file)
--- a/src/libostree/libostree-devel.sym
+++ b/src/libostree/libostree-devel.sym
@@ -36,7 +36,6 @@ global:
   ostree_sign_add_pk;
   ostree_sign_set_sk;
   ostree_sign_summary;
-  ostree_sign_dummy_get_type;
   ostree_sign_ed25519_get_type;
 } LIBOSTREE_2020.1;
 

diff --git a/src/libostree/ostree-sign-dummy.c b/src/libostree/ostree-sign-dummy.c
index 034c7d6bc08d921767dd245cde58b31bce39b02d..df5a7b8284c07d258ddcc08cf9f4a3358fe9848e 100644 (file)
--- a/src/libostree/ostree-sign-dummy.c
+++ b/src/libostree/ostree-sign-dummy.c
@@ -50,7 +50,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (OstreeSignDummy, g_object_unref)
 static void
 ostree_sign_dummy_iface_init (OstreeSignInterface *self);
 
-G_DEFINE_TYPE_WITH_CODE (OstreeSignDummy, ostree_sign_dummy, G_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (OstreeSignDummy, _ostree_sign_dummy, G_TYPE_OBJECT,
         G_IMPLEMENT_INTERFACE (OSTREE_TYPE_SIGN, ostree_sign_dummy_iface_init));
 
 static void
@@ -70,13 +70,13 @@ ostree_sign_dummy_iface_init (OstreeSignInterface *self)
 }
 
 static void
-ostree_sign_dummy_class_init (OstreeSignDummyClass *self)
+_ostree_sign_dummy_class_init (OstreeSignDummyClass *self)
 {
   g_debug ("%s enter", __FUNCTION__);
 }
 
 static void
-ostree_sign_dummy_init (OstreeSignDummy *self)
+_ostree_sign_dummy_init (OstreeSignDummy *self)
 {
   g_debug ("%s enter", __FUNCTION__);
 
@@ -88,7 +88,7 @@ gboolean ostree_sign_dummy_set_sk (OstreeSign *self, GVariant *key, GError **err
 {
   g_debug ("%s enter", __FUNCTION__);
 
-  OstreeSignDummy *sign =  ostree_sign_dummy_get_instance_private(OSTREE_SIGN_DUMMY(self));
+  OstreeSignDummy *sign =  _ostree_sign_dummy_get_instance_private(OSTREE_SIGN_DUMMY(self));
 
   g_free(sign->sk_ascii);
 
@@ -101,7 +101,7 @@ gboolean ostree_sign_dummy_set_pk (OstreeSign *self, GVariant *key, GError **err
 {
   g_debug ("%s enter", __FUNCTION__);
 
-  OstreeSignDummy *sign =  ostree_sign_dummy_get_instance_private(OSTREE_SIGN_DUMMY(self));
+  OstreeSignDummy *sign =  _ostree_sign_dummy_get_instance_private(OSTREE_SIGN_DUMMY(self));
 
   g_free(sign->pk_ascii);
 
@@ -120,7 +120,7 @@ gboolean ostree_sign_dummy_data (OstreeSign *self,
   g_debug ("%s enter", __FUNCTION__);
   g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE);
 
-  OstreeSignDummy *sign =  ostree_sign_dummy_get_instance_private(OSTREE_SIGN_DUMMY(self));
+  OstreeSignDummy *sign =  _ostree_sign_dummy_get_instance_private(OSTREE_SIGN_DUMMY(self));
 
   *signature = g_bytes_new (sign->sk_ascii, strlen(sign->sk_ascii));
 
@@ -158,7 +158,7 @@ gboolean ostree_sign_dummy_data_verify (OstreeSign *self,
   g_return_val_if_fail (OSTREE_IS_SIGN (self), FALSE);
   g_return_val_if_fail (data != NULL, FALSE);
 
-  OstreeSignDummy *sign =  ostree_sign_dummy_get_instance_private(OSTREE_SIGN_DUMMY(self));
+  OstreeSignDummy *sign =  _ostree_sign_dummy_get_instance_private(OSTREE_SIGN_DUMMY(self));
 
   gboolean ret = FALSE;
 

diff --git a/src/libostree/ostree-sign-dummy.h b/src/libostree/ostree-sign-dummy.h
index 6fc3a363da113eee05459dfdd84bd47fe5bdc2df..c37bcdfaf96b66b9a60db8569d789cac9fc295a8 100644 (file)
--- a/src/libostree/ostree-sign-dummy.h
+++ b/src/libostree/ostree-sign-dummy.h
@@ -30,17 +30,16 @@
 
 G_BEGIN_DECLS
 
-#define OSTREE_TYPE_SIGN_DUMMY (ostree_sign_dummy_get_type ())
+#define OSTREE_TYPE_SIGN_DUMMY (_ostree_sign_dummy_get_type ())
 
-_OSTREE_PUBLIC
-GType ostree_sign_dummy_get_type (void);
+GType _ostree_sign_dummy_get_type (void);
 
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 typedef struct _OstreeSignDummy OstreeSignDummy;
 typedef struct { GObjectClass parent_class; } OstreeSignDummyClass;
 
-static inline OstreeSignDummy *OSTREE_SIGN_DUMMY (gpointer ptr) { return G_TYPE_CHECK_INSTANCE_CAST (ptr, ostree_sign_dummy_get_type (), OstreeSignDummy); }
-static inline gboolean OSTREE_IS_SIGN_DUMMY (gpointer ptr) { return G_TYPE_CHECK_INSTANCE_TYPE (ptr, ostree_sign_dummy_get_type ()); }
+static inline OstreeSignDummy *OSTREE_SIGN_DUMMY (gpointer ptr) { return G_TYPE_CHECK_INSTANCE_CAST (ptr, _ostree_sign_dummy_get_type (), OstreeSignDummy); }
+static inline gboolean OSTREE_IS_SIGN_DUMMY (gpointer ptr) { return G_TYPE_CHECK_INSTANCE_TYPE (ptr, _ostree_sign_dummy_get_type ()); }
 
 G_GNUC_END_IGNORE_DEPRECATIONS